Only remove PropertyNotify events from the stream if they have been

2003-09-10  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtksocket.c (gtk_socket_filter_func): Only remove
	PropertyNotify events from the stream if they have been handled,
	in order to enable extending the plug<->socket communication via
	properties.

diff --git a/ChangeLog b/ChangeLog
index 76d5f998fc7278333c9bd103c62b16e378f4d7f1..38fb5ec57e0f4b4b8f6676dee09b46644baaac2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-10  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Only remove 
+       PropertyNotify events from the stream if they have been handled,
+       in order to enable extending the plug<->socket communication via
+       properties.
+
 Wed Sep 10 01:06:44 2003  Kristian Rietveld  <kris@gtk.org>
 
        Big TreeView DnD fixage, makes drops on empty models work, makes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 76d5f998fc7278333c9bd103c62b16e378f4d7f1..38fb5ec57e0f4b4b8f6676dee09b46644baaac2d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2003-09-10  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Only remove 
+       PropertyNotify events from the stream if they have been handled,
+       in order to enable extending the plug<->socket communication via
+       properties.
+
 Wed Sep 10 01:06:44 2003  Kristian Rietveld  <kris@gtk.org>
 
        Big TreeView DnD fixage, makes drops on empty models work, makes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 76d5f998fc7278333c9bd103c62b16e378f4d7f1..38fb5ec57e0f4b4b8f6676dee09b46644baaac2d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2003-09-10  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Only remove 
+       PropertyNotify events from the stream if they have been handled,
+       in order to enable extending the plug<->socket communication via
+       properties.
+
 Wed Sep 10 01:06:44 2003  Kristian Rietveld  <kris@gtk.org>
 
        Big TreeView DnD fixage, makes drops on empty models work, makes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 76d5f998fc7278333c9bd103c62b16e378f4d7f1..38fb5ec57e0f4b4b8f6676dee09b46644baaac2d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2003-09-10  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Only remove 
+       PropertyNotify events from the stream if they have been handled,
+       in order to enable extending the plug<->socket communication via
+       properties.
+
 Wed Sep 10 01:06:44 2003  Kristian Rietveld  <kris@gtk.org>
 
        Big TreeView DnD fixage, makes drops on empty models work, makes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 76d5f998fc7278333c9bd103c62b16e378f4d7f1..38fb5ec57e0f4b4b8f6676dee09b46644baaac2d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2003-09-10  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_filter_func): Only remove 
+       PropertyNotify events from the stream if they have been handled,
+       in order to enable extending the plug<->socket communication via
+       properties.
+
 Wed Sep 10 01:06:44 2003  Kristian Rietveld  <kris@gtk.org>
 
        Big TreeView DnD fixage, makes drops on empty models work, makes

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index feaa594f16cfaa7d5f213b8aea47aa4f465493de..0c3068ae03d7b22874087a61b6b2f85486abe294 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -1389,6 +1389,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
            {
              socket->have_size = FALSE;
              gtk_widget_queue_resize (widget);
+             return_val = GDK_FILTER_REMOVE;
            }
          else if ((xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "XdndAware")) ||
              (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_RECEIVER_INFO")))
@@ -1403,6 +1404,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 
              gdk_display_sync (display);
              gdk_error_trap_pop ();
+             return_val = GDK_FILTER_REMOVE;
            }
          else if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO"))
            {
@@ -1428,9 +1430,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
                        }
                    }
                }
+             return_val = GDK_FILTER_REMOVE;
            }
-                  
-         return_val = GDK_FILTER_REMOVE;
        }
       break;
     case ReparentNotify: